Many added mnemonics and fixes #5
Open
+49
−35
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added missing registers (X, Y, Z, PC, ZERO), missing instructions (adiw, icall), #-directives Labels after jump command (e.g. rjmp, brcs, etc.) are now colored.
Update avr-asm.tmLanguage
Added: Commands: adiw, mul, muls, mulsu, fmul, fmuls, mfulsu, eijmp, jmp, icall, eicall, call, elpm, espm. Added: Directives: elseif, word, warning. Fixed: Conflicts[]:
Fixed: Conflicts[]: - 1. Between ".cseg" and ".csegsize" - 2. Between ".endm" and ".endmacro" - 3. Between ".elif"/".else" and ".elseif" - 4. Between ".if" and ".ifdef"/".ifndef" - 5. Between ".list" and ".listmac"
vyivanov
reviewed
Sep 28, 2016
| { | ||
| "match": "(?i)\\br(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)\\b", | ||
| "match": "(?i)\\bR(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)\\b", |
There was a problem hiding this comment.
Why did you make uppercase for general purpose registers? This does not take effect because regex is configured with ?i (case insensitive mode).
| { | ||
| "match": "(?i)\\b(xl|xh|yl|yh|zl|zh)\\b", | ||
| "match": "(?i)\\b(XL|XH|YL|YH|ZL|ZH)\\b", |
| { | ||
| "match": "(?i)(^|\\s)\\.(byte|cseg|csegsize|db|dd|def|device|dq|dseg|dw|elif|else|endif|endm|endmacro|equ|error|eseg|exit|if|ifdef|ifndef|include|list|listmac|macro|message|nolist|org|set|undef)", | ||
| "match": "(?i)(^|\\s)\\.(byte|csegsize|cseg|db|dd|def|device|dq|dseg|dw|elseif|elif|else|endif|endmacro|endm|equ|error|eseg|exit|ifdef|ifndef|if|include|listmac|list|macro|message|nolist|org|set|undef|word|warning)", |
There was a problem hiding this comment.
I guess you're trying to fix problem with partial highlighting of several directives. Proper fix is to wrap this match with \b regex anchor like this was done with mnemonics.
| @@ -137,7 +168,7 @@ | |||
| <key>comment</key> | |||
| <string>Dec number constant</string> | |||
| <key>match</key> | |||
| <string>\b(0|[1-9]\d+)\b</string> | |||
| <string>\-?\b(\d+)\b</string> | |||
There was a problem hiding this comment.
Don't try to directly edit *.tmLanguage file. Your changes will be lost since the file is generated from *.JSON-tmLanguage one.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some significant fixes )) All fixes see in previous commits